From: Colin Walters <walters@verbum.org>
Date: Fri, 18 Nov 2022 15:42:58 +0000 (-0500)
Subject: ci: Fix case where cosa != buildroot
X-Git-Tag: archive/raspbian/2022.7-2+rpi1^2~13^2^2~11^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=406bfc78d1c1eb848dfd5000c9b7c6404c499146;p=ostree.git

ci: Fix case where cosa != buildroot

We can't override host binaries in this case.  We'll need
to watch carefully and verify we're still testing things.
---

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 003588a6..762b705b 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -34,6 +34,7 @@ stage("Build") {
         shwrap("""
           make install DESTDIR=\$(pwd)/installed/rootfs
           make -C tests/kolainst install DESTDIR=\$(pwd)/installed/tests
+          bash -c '. /usr/lib/os-release && echo \$VERSION_ID' >\$(pwd)/installed/buildroot-id
         """)
       }
       stash includes: "installed/", name: 'build'
@@ -47,8 +48,12 @@ cosaPod(runAsUser: 0, memory: "9Gi", cpu: "4") {
     checkout scm
     unstash 'build'
     shwrap("""
-      # Move the bits into the cosa pod
-      rsync -rlv installed/rootfs/ /
+      # Move the bits into the cosa pod (but only if major versions match)
+      buildroot_id=\$(cat installed/buildroot-id)
+      osver=\$(. /usr/lib/os-release && echo \$VERSION_ID)
+      if test \$osver = \$buildroot_id; then
+        rsync -rlv installed/rootfs/ /
+      fi
       rsync -rlv installed/tests/ /
       coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
       mkdir -p overrides/rootfs